201bfe8ac93258144bfe6763f5d09333aedc9b55,opennms-services/src/test/java/org/opennms/netmgt/collectd/HttpCollectorTest.java,HttpCollectorTest,setUp,#,76

Before Change


        MockUtil.println("------------ Begin Test " + getName() + " --------------------------");
        MockLogAppender.setupLogging();

        MockNetwork m_network = new MockNetwork();
        m_network.setCriticalService("ICMP");
        m_network.addNode(1, "testnode");
        m_network.addInterface(InetAddress.getByName(m_testHostName).getHostAddress());
        m_network.addService("ICMP");
        m_network.addService("HTTP");

        MockDatabase m_db = new MockDatabase();
        m_db.populate(m_network);

        DataSourceFactory.setInstance(m_db);
        
        MockEventIpcManager eventIpcManager = new MockEventIpcManager();
        

After Change


    @Before
    public void setUp() throws Exception {
        assertNotNull(m_mockEventIpcManager);
        assertNotNull(m_ipInterfaceDao);
        assertNotNull(m_nodeDao);

        if (m_nodeDao.findByLabel("testnode").size() == 0) {
            NetworkBuilder builder = new NetworkBuilder(m_distPoller);
            builder.addNode("testnode");
            builder.addInterface(InetAddress.getByName(m_testHostName).getHostAddress()).setIsManaged("M").setIsSnmpPrimary("P").setIpStatus(1);
            builder.addService(getServiceType("ICMP"));
            builder.addService(getServiceType("HTTP"));
            if (m_nodeDao == null) {
                throw new Exception("node DAO does not exist!");
            }
            OnmsNode n = builder.getCurrentNode();
            assertNotNull(n);
            m_nodeDao.save(n);
            m_nodeDao.flush();
        }

        HttpCollector collector = new HttpCollector();